Autogenerated HTML docs for v2.21.0-196-g041f5
diff --git a/RelNotes/2.22.0.txt b/RelNotes/2.22.0.txt index 16d3110..ca774e8 100644 --- a/RelNotes/2.22.0.txt +++ b/RelNotes/2.22.0.txt
@@ -31,6 +31,11 @@ * The command line completion (in contrib/) has been taught to complete more subcommand parameters. + * The final report from "git bisect" used to show the suspected + culprit using a raw "diff-tree", with which there is no output for + a merge commit. This has been updated to use a more modern and + human readable output that still is concise enough. + Performance, Internal Implementation, Development Support etc. @@ -47,6 +52,9 @@ * "git prune" has been taught to take advantage of reachability bitmap when able. + * The command line parser of "git commit-tree" has been rewritten to + use the parse-options API. + Fixes since v2.21 ----------------- @@ -85,6 +93,47 @@ ETAGS on. (merge 92b88eba9f js/find-lib-h-with-ls-files-when-possible later to maint). + * "git rebase" that was reimplemented in C did not set ORIG_HEAD + correctly, which has been corrected. + (merge cbd29ead92 js/rebase-orig-head-fix later to maint). + + * Dev support. + (merge f545737144 js/stress-test-ui-tweak later to maint). + + * CFLAGS now can be tweaked when invoking Make while using + DEVELOPER=YesPlease; this did not work well before. + (merge 6d5d4b4e93 ab/makefile-help-devs-more later to maint). + + * "git fsck --connectivity-only" omits computation necessary to sift + the objects that are not reachable from any of the refs into + unreachable and dangling. This is now enabled when dangling + objects are requested (which is done by default, but can be + overridden with the "--no-dangling" option). + (merge 8d8c2a5aef jk/fsck-doc later to maint). + + * On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX), + the upload-pack that runs on the other end that hangs up after + detecting an error could cause "git fetch" to die with a signal, + which led to a flakey test. "git fetch" now ignores SIGPIPE during + the network portion of its operation (this is not a problem as we + check the return status from our write(2)s). + (merge 143588949c jk/no-sigpipe-during-network-transport later to maint). + + * A recent update broke "is this object available to us?" check for + well-known objects like an empty tree (which should yield "yes", + even when there is no on-disk object for an empty tree), which has + been corrected. + (merge f06ab027ef jk/virtual-objects-do-exist later to maint). + + * The setup code has been cleaned up to avoid leaks around the + repository_format structure. + (merge e8805af1c3 ma/clear-repository-format later to maint). + + * "git config --type=color ..." is meant to replace "git config --get-color" + but there is a slight difference that wasn't documented, which is + now fixed. + (merge cd8e7593b9 jk/config-type-color-ends-with-lf later to maint). + * Code cleanup, docfix, build fix, etc. (merge 11f470aee7 jc/test-yes-doc later to maint). (merge 90503a240b js/doc-symref-in-proto-v1 later to maint).
diff --git a/git-commit-tree.html b/git-commit-tree.html index ed51997..3935a39 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html
@@ -764,6 +764,9 @@ <div class="paragraph"><p>Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless <code>-m</code> or <code>-F</code> options are given.</p></div> +<div class="paragraph"><p>The <code>-m</code> and <code>-F</code> options can be given any number of times, in any +order. The commit log message will be composed in the order in which +the options are given.</p></div> <div class="paragraph"><p>A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) @@ -787,7 +790,7 @@ </dt> <dd> <p> - An existing tree object + An existing tree object. </p> </dd> <dt class="hdlist1"> @@ -813,7 +816,8 @@ <dd> <p> Read the commit log message from the given file. Use <code>-</code> to read - from the standard input. + from the standard input. This can be given more than once and the + content of each file becomes its own paragraph. </p> </dd> <dt class="hdlist1"> @@ -1046,7 +1050,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2018-01-26 15:11:04 PST + 2019-03-20 16:15:37 JST </div> </div> </body>
diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 002dae6..4b90b9c 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt
@@ -23,6 +23,10 @@ emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given. +The `-m` and `-F` options can be given any number of times, in any +order. The commit log message will be composed in the order in which +the options are given. + A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) @@ -41,7 +45,7 @@ OPTIONS ------- <tree>:: - An existing tree object + An existing tree object. -p <parent>:: Each `-p` indicates the id of a parent commit object. @@ -52,7 +56,8 @@ -F <file>:: Read the commit log message from the given file. Use `-` to read - from the standard input. + from the standard input. This can be given more than once and the + content of each file becomes its own paragraph. -S[<keyid>]:: --gpg-sign[=<keyid>]::
diff --git a/git-config.html b/git-config.html index 3f2c69f..7778f3d 100644 --- a/git-config.html +++ b/git-config.html
@@ -1162,7 +1162,9 @@ output. The optional <code>default</code> parameter is used instead, if there is no color configured for <code>name</code>. </p> -<div class="paragraph"><p><code>--type=color [--default=<default>]</code> is preferred over <code>--get-color</code>.</p></div> +<div class="paragraph"><p><code>--type=color [--default=<default>]</code> is preferred over <code>--get-color</code> +(but note that <code>--get-color</code> will omit the trailing newline printed by +<code>--type=color</code>).</p></div> </dd> <dt class="hdlist1"> -e @@ -9028,7 +9030,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2018-11-13 23:05:48 JST + 2019-03-20 16:15:37 JST </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index 1bfe9f5..d0b9c50 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -240,7 +240,9 @@ output. The optional `default` parameter is used instead, if there is no color configured for `name`. + -`--type=color [--default=<default>]` is preferred over `--get-color`. +`--type=color [--default=<default>]` is preferred over `--get-color` +(but note that `--get-color` will omit the trailing newline printed by +`--type=color`). -e:: --edit::
diff --git a/git-fsck.html b/git-fsck.html index c0edb3d..044481b 100644 --- a/git-fsck.html +++ b/git-fsck.html
@@ -852,10 +852,17 @@ </dt> <dd> <p> - Check only the connectivity of tags, commits and tree objects. By - avoiding to unpack blobs, this speeds up the operation, at the - expense of missing corrupt objects or other problematic issues. + Check only the connectivity of reachable objects, making sure + that any objects referenced by a reachable tag, commit, or tree + is present. This speeds up the operation by avoiding reading + blobs entirely (though it does still check that referenced blobs + exist). This will detect corruption in commits and trees, but + not do any semantic checks (e.g., for format errors). Corruption + in blob objects will not be detected at all. </p> +<div class="paragraph"><p>Unreachable tags, commits, and trees will also be accessed to find the +tips of dangling segments of history. Use <code>--no-dangling</code> if you don’t +care about this output and want to speed it up further.</p></div> </dd> <dt class="hdlist1"> --strict @@ -1039,7 +1046,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-02-06 23:17:45 PST + 2019-03-20 16:15:37 JST </div> </div> </body>
diff --git a/git-fsck.txt b/git-fsck.txt index 55950d9..e0eae64 100644 --- a/git-fsck.txt +++ b/git-fsck.txt
@@ -62,9 +62,17 @@ with --no-full. --connectivity-only:: - Check only the connectivity of tags, commits and tree objects. By - avoiding to unpack blobs, this speeds up the operation, at the - expense of missing corrupt objects or other problematic issues. + Check only the connectivity of reachable objects, making sure + that any objects referenced by a reachable tag, commit, or tree + is present. This speeds up the operation by avoiding reading + blobs entirely (though it does still check that referenced blobs + exist). This will detect corruption in commits and trees, but + not do any semantic checks (e.g., for format errors). Corruption + in blob objects will not be detected at all. ++ +Unreachable tags, commits, and trees will also be accessed to find the +tips of dangling segments of history. Use `--no-dangling` if you don't +care about this output and want to speed it up further. --strict:: Enable more strict checking, namely to catch a file mode
